Improvements to the previous notebook