added waypoint and transitions