Lots of things rewritten