Updated for finding location