updates for v3.1