changes for v3.1