Should handle multiple trajectories while still working the way it did before