Another small optimization
Attempt to use remove use of tracking variable
Revert "Attempt to use remove use of tracking variable"

This reverts commit f3fea513b93f98b31c16c3dea362d0b88db9082f.
First row fix to the new format