major changes for scenarios and requirements