moving state provider selection to state definition
moving state provider selection to state definition