just expand events.h, leave the rest the same, just a readability issue