changed places to use locations