added customerId and commented out needless calls