Add the notion of box instead of window
Rename box