Adding disconnect stuff