Updated Code for my current location