Adding IF and comments