Updated event handlers to act only on CRITICAL state