Update scenario based on feedback at 06/22