Chg distinct scenarios, fixes, new types