else ifs changed