countUntil additions + reorg