Changed if statements