pre-demo changes