move to rivet2