Restructuring due to sonar results