Track buffering