final demo changes