Updated for "private" ADHD changes