left a few un-namespaced functions