[es] cases 25 and 26. And small corrections to cases 18 and 20