Revised version of client side of roc