added sonar support