Added code to keep track of the current location