cleaned up demo for version 2.0