update to funcs to make it easier to install in two locations