Significant speed improvement in initial settings - hopefully correct