reworked notebook support.