modifed somethings