get rid of generic padding, be more specific