Updated the demo significantly.