Moving to 3 features per binary category, old trinary branch added