Made if statements comply to new BNE