Rework track_modes