Few changes (CurrentLocation)