Sonar now auto switching