Making the demo more configurable.