prepare for XI

aka final version