rearranging Client a little