Updated to work with single-file chipper strategy