Many more additions of code to Mario.