major class updates