More notebook work