Updated for class