Made some modification to try and get all clients to connect