Note review (23/26)

Note review