Updated demo with performance fix