The latter sounds like it would be the least disruptive, so let's do that.