Added padding; more testing required