Andrew s/new function covertor all

-add functional