Upgrading to version 3.x