some modifcations