Improved logic for use current location