Freshed up the demo a bit