refactored location to be partly point now