Final version before remake