little changes in mappings