updataed client and server