Use new increments algorithm, add comments