Major improvements to note and sticky models