Pre demo changes