New style (smoothness test as well)