refactored and added remappings