Changes up to 8.25