293: refactor Curve