Updating the classes well.