slimming down the demo