tweaked mappings