more work on merchant, may break consumer side