volatility 2.4 (new formula)

I hope I am doing this right
Use a single `if` for both of these.