added demo-switch