some changes

-need to get edit