Updated with notes from before vacation