Don/demo prep

@stepzhou For the demo