initial changes fro locations refactoring