Changed to approved IFDEFs