Boxes refactoring
Boxes refactoring