updated mappings, manually reviewed