Updated with notes for