[Agent] NSF Issue 3 [Ongoing]