changed scenario superclass and subclass to match eachother better