[12768] EventAI - Some random changes