Prep work for enabling a new rematching method