Another attempt at #6
Ran in my dev and seemed to work...