Should handle multiple trajectories while still working as before