some small changes in class