added DOA and so on
 made DOA changes