revised mappings