Curtain Rewrite #2, still failing