Note handling changes