Experimental changes to the client tools