Additional Update

Still trying to get FuncNoBuild to work.