Sonar have been rewritten to run faster