Rewrite show completed if's