Trajectory controls rewritten