some modifactions