Tracking default order should now be correct

Reworked the tracking packet creation, should be better