scenario improvements