references & waypoints added