Updated with new demo stuff