the different clients and some changes in demo code