Shave off a couple lines
Merge branch 'v3'