Updated termination procedure