Improved padding