Improved version of the new burrow tracking