updated tracking number logic