Updated for Class