Added notes, removed Lazy