modified some mappings