Updated collect_data and strap.*