Added events and crash and repair