Made changes in class