Revert "With Second notes"

This reverts commit 6209d991392a5ab12a6774e4087ce4f8481a2ce2.
Revert "Revert "With Second notes""

This reverts commit df0d5c1cae3ac15e43063a18c5aadf54a052c520.