updated with NBFB