Update from class (mostly done)