use newly refactored location