worked more on the map classes