LPS-43564 Updating events when needed