Code change on padding