Added trajectories, etc.