Updated FuncGenerated