Added a version with more padding