Updated the demo with lastest updates