@mikemcquaid Expanded a bit, and more efficient to boot.