changed a lot of maps