Made some changes to the Map