Fixed up track controls