2.0 - update class basics