Worked on disconnection issues