Added Current Location option