Volatility2

Hope this fixes the merge conflict