Some more tweaking with event conditions.