Changes for sonar.