changes for aggregate measure calculations