Updated chunk numbering