Now handles notes.