Note review (21/26)

Note review