updated for merchant