Changes to the chunker