changes for classes and events