Location aspects

didnt want to merge... error. Looking to delete pull request .