Added sonar stuff