Added delayed disconnect