client stage 2 bugfixing ysdbhflsdfgb