improving disconnect