updated DOE
fixed merge