Updating Ronjian's Aggregate model/ don't touch cache just yet...