Re-hack the trajectory generator