Re: [NTG-context] Adjust the tracking