Added dynamic step size, not activated
Fixed mergeconflict