Better traj generation