Moved new demo to separate file