Changes for Volatility 2.3