Advance in the conceptual design of the European DEMO magnet system