Put width and height back in