with removal added, scenario updates