Fixed adhoc_setup for peter