Changes needed for nic4