need to move the deprecation and fix the tests.
need to move the deprecation and fix the tests.