Jacky

merge new beans and daos