commented out cancelDiscovery and added extra logs