refactored locations for everything