added missing MakeFun statements