preparing for v82