[HistoryZap] updated for new code.