changes in dao, moved to right class