Finish the remake for full version