(R)Remake but always not finish