Updated EventHandler, new build