Updated demo with latest p2