updated for all classes