Revert "Revert "notes""

This reverts commit 878a0c7b3b05a033f340addd6a574ae34daa391e.