fixed scenario stuff