Modified the TODO and tracked the moved nl_iface.c