moved a few more mappings