Added leading zero option