Location refactored