some modivications