#1 update to expand rollup rules