Redo Best Fit changes that got wiped out