Change to method of getting last location