update with gen~ classes