changes to Dao