first, squashed EA branch