demo update
del demo
trial
Merge branch 'khan'