Change best-fit only versions to new fitting