More copy changes back on mariokart branch