new note, old fixes