More reliable update & stop notification