Use new provider

OQ: waterfall?