Update trajectory generation for 2025 changes.
Update trajectory generation for 2025 changes.