neat replace function mappings added