updated about one half of classes