Added some nulling