merged notebook and office versions