Added waypoints to track breadcrumb