removed a couple more if statements