modified Client and add 20140516