Start of change to add root note control.