Add replay for diagnostic purpose