better way to preseve leading zeros