updates in several classes