@asmeurer, are you ok with this?