Updated Trajectory to restore its correctness