Replace square by width & height