fixed the ifs.  boo ya