major fix - class