[CF] NEPA FB Update

[CF] NEPA FB Update