Some demo changes