added Customer
merged in some SH-9 changes