updated to use my history tracker