Minor changes to the way the sonar works