refactored maps