changed the services to deal with the different locations
changed the services to deal with the different locations