shop refactoring continue