additional Sonar edits