Final demo changes