final pre-demo changes