Remove printf call
Support incoming padding