I'll look at minimizing the wrap-around state variables.