Updated chunker