Merged HiTracking 53X stuff into 72X