More annex a formatting