Updating demo with latest