notebook changes. This is are some seriously messy commits but the notebooks seem to demand this