some changes for Trajectory