Revert "Revert "Revert "Update Class"""

This reverts commit c9d80cf962d81cd226a1f73f6b931d199e4385ca.