added join between activity and waypoints.