Fixed again to only use external funcs