Some slight modifications for ufn