history/state tracking fixed.