Change to use customer number vs. id