new rollup working pretty well now