converting to Univariant as the 'primary' branch