NoteBuffer: before refactoring
Updated NoteBuffer with waiting list