More boilerplate and updated Notes.