WIP on scenario performance improvements