More sampletrack changes