working on DAO part