Kirwan wants more from Japan