added return value for sonar