changed over to new dao