Updated the map, removed some ugly code.