Improvements based on Sonar analysis