Merged Functions back into FuncMap