merge in yipit changes