Changed Sonar to be more accurate