added no more events check