Rebased3 fix replay

I can see how to re-jig it, so will use the Wall-clock as you suggest here.