some changes on stuff