Added my location handling (phase I)