Update to new f-n changes