Further Update to Location.java