Modify DEMO to fit the lib.