overhauled mappings