Re: [NTG-context] Align with comments