few changes in classes