Change to handle the disconnect