fixing playback timing
Merge branch 'refs/heads/save-branch'