Working on location finding
merged