redo Sonar improvements