Tweak the Prepared class, r2