Started rewriting again