change to consumer client model