Let's confirm with @joshwoodward to be sure that what's we want.