improve function, add credit card number