demo update, code layout change
demo update, code layout change