Going to 1.7
+ reset_accum() and reset on NNC update