updated for class crit prototype