changes by JW