Fixed/Updated, kind of, for r80