sonar 2.2

i'm a slow upgrader, but i go by the "if it ain't broke don't fix it" rule.