updated with revised scenarios