Changing tracking to be based on dividers and not top/bottom of sections