Rearrange code to deal with the two kinds of clients we have