Refactor - no need to work out location again