Make the demo a bit easier to use.