some changes in classes