Changes Richard Schneider except bundle tests