Added 7 more if statements and changed XOR to &&