merge bob danna changes