changed some mappings