Continue rewriting everything