merged Brian and Adams changes