updated based on scenario changes