updated for sonar major issues