Updates demos

@yoavweiss and I fixed up the demos to use the modern syntax.