some changes we are not sure about