Note review (24/26)

Note review