some changes in syntax