proper base change

#todo/untagged #todo/add-references