beauty sonar and bug fix