update after fixes with Tom - IIF If