Added curvature optimization