6.4 - ADHD update

Uses ADHD public methods.
bind mode changes