Updating the design for data collection mode.