Updated to v3.1