Change to Mario's version