Use new provider

waterfall?