Updates to fix replay.  Still not working properly.