draft-25-changes-updated