Upgrading gaeforms