Revise the use of needPadding as we discussed offline.