2nd try at padding changes