Updated with new notes/exercises