ENH: if's modified