Hmw6 part3 tracking code fix