add honoring of w&h back (sorry)