separated chunker, with fixes