new 610 strings
code refactoring for 610
refactoring for 610
refactor for 610