modifications from JW