Update to version 3.1 with Bill's suggestions