Added hex format and padding fix back in