update with condatos and hiv@30 fix