removed ifs