updated customer and market
merged