Now using the new @EventHandler