remapping a few more things