Rivet Tools 2.0