Rework trading to base trade on smooth curve