new dao implementation
bugfix