some structural changes, new notebook