Updated event injection and timer