Revert "Revert "Revert "Revert "Revert "in class update"""""

This reverts commit 4f01dc4e9b1dffac077b1b4506366795108e5c36.
Revert "Revert "in class update""

This reverts commit 3d9452d45cea325ed4827f051492e95835d5a5fa.
Revert "in class update"

This reverts commit dd5edbaf4b6ecfe39159352d1da7d14a3e0f1046.