Updating demo with new features