[tcc-2013] Attempt to use headers instead of numbering