add some changes for p 87