some changes on two