Copied bunch of changes from corrupt repository