Bringing this notebook up to date with recent changes. Rerunning.