Revert "Reverted map changes and trying MY map changes."

This reverts commit e1887e858750331f6442cdeeee81ca111b3b5d14.