First modified version to fit com.alhoda.shefa