moved towards more general cpi data collection