Update chunks thing
Merge branch 'exp' into exp-m