finished refactor to use VolCurve