New logic to determine user location