some improvements after ch10