Combinging disconnect code to try and minimize errors with the logic