Use width and height instead of simple square size