Erik's final revisions