Better handling, No need for the padding option