Fix bugs... +  new dao