try to clean up the routines a bit
still trying the customer part