added update implmentation
Merge branch 'daofuture'