improve event states