Kidong: almost finished Doctor side, changed in DAO