changing up some ifs