Swapped settingup the waiting group around