no10, no11 refactoring