done some changes