some changes in class