issue 3 dao some changes
dao made but not tested yet