Notes rework