Added the deconnecter & stuff