start commit by orest
dao fixing