Reimplemented partial changes, archive only