Improve the Demo