brick refactoring
plug refactoring