Better transition and handle complete stage