Reduces major issues on sonar from 21 to 3