New update

Modify the class and handler