added comment for curve
fixed merge conflicts