updates for nb3.6