Adds speedy preparation, removes in-place modification