ECOM-369 updated in light of review with Andy and code review