updates from last class revisions