v2

@troygoode CR please.  Thanks!
Ah, makes sense.