Fix playback, simplify