v2

@troygoode CR please.  Thanks!
Same as above