more changes to make DO work