Simplified and streamlined the rollup code