added notebook, etc.