updated for class