added linear playback
merge