modfied client