some changes from notebook