few more class revisions