Yes - that's the plan, and it's mandatory in NYS