Changed padding mechanism