modified dr3 from master branch