more work on the replay engine