some changes b4 ch10