Adding some more conditionals with for loops