Re: update disconnect and order of operations