some changes from CR