2710 refactoring