#25 OnDisconnect logic implemented