Upgrading gapi2