EventTools.class modified