refs 8881 refactoring