ross's commit
Class changes