migrated sceanrio to consolidated configuration + use queue to avoid conflicts