That's the plan, on paper at least. By 2030 they want Upstate to be almost entirely Hydro and Nuclear. Downstate will follow by 2040.