Changed demo to new style, now compiles