Fiji coach Mac McCallion has made seven changes and demanded his team improve their discipline for tomorrow’s World Cup Pool B clash with Japan in Townsville.

Fijian second rower Ifereimi Rawaqa will make a dramatic return to Test rugby when he plays against France in their opening World Cup clash in Brisbane on Sunday, just a few weeks after being apparently ruled out of the tournament with a prolapsed disc.