fixing demo stuff