added map and #
refactoring
refactoring
refactoring