Copied over revisions from previous fork