Added in the correct chunking logic