Revert "Revert "Revert "With Second notes"""

This reverts commit 37c699c24116ec144d759fbeabe74e162cb48671.
Revert "Revert "Revert "Revert "With Second notes""""

This reverts commit cb5d55bfdc130a489d5aa68183320f260cd03e7e.