reformed the map in much better way