slightly new flavors after merge