Changed adhoc_setup for iris