Revert "Revert "JWR changes""

This reverts commit bcf8b0b02ab09d1a2d114a6c0d847f4c6b93997f.