Update for spec merge w RB