Continued making Sonar edits.