Try and improve event detection