Maybe I nailed it this time, new event structiure