added historyTracker