new changes

some changes are done by me