Enhance demo towards javascript