added ability to suppress non-generated events