Added appropriate (to be exported) functions back to NAMESPACE