cleaned up  map1