minor modification on mappings