JEvents fork with added functionality