major changes for scenarios