More support for notebooks.