added sonar code