Make track choice work :)