some changes on