Commiting pre testing all the possible fixes on the multiclient stuff.