Changes in the router and more work on active workouts