Do the same thing for OnChangeClass
This way might not work