Implementing proper fitting for the new scheme.