Ripple complete fix2