rephase the tracking logic; currently cannot run; need to merge the two pass