Rewritten some more