working to straighten out events