Updated with new notes