refactored default location