Adjustments to make DO work again.