Upgraded to v3.4.0