Pull in feedback from @surfacedamage