Minor modifications; lfunc