Added NoteTracker