Improve first curve calculation