tweaked client to more closly match my specific case