#9 change some methods in DAO