Added additional ifs to control argument input