add event class and modify header-related methods
same as above