First changes in class