updated for the latest location tool changes