made some sonar changes.