Towards volatility, first step
Before changes with harness