Updated demoPage and lib.