BZ added client/server