Improved event system, part 2