Update to .25, v3.1 FINAL