added notebook
merging in