some changes for final proof