onConnectDone Handling Update