Get track progression working again after regressions