changed ifs