merging in umx functions from dev library