modifed some