update for dao @Author : Alex