some changes in style