Update to record/playback logic