finding location,  some other changes