Tony update finalize, return_finalize, welcome