add dosc
merge
update