Added in notes and users