fixed my botched playback merge from 3 months ago