integrating product changes from emily