Location adjustements

Location adjustements