Added automatic location finder