some changes on code