Rebased3 fix replay

What about using a tuple so you can return two values? Seems like a better design.