some changes submitted