switch to use userId instead of customerId