Did one thing twice… rewriting some bits