made some changes in class