Adding finalize option