Made some ifs elifs