2D optimization added which switches between explorative and ' old curve
fitting'