Add demo and rewrite conditions