add refactoring from WI5