modifications from JW
updates