More changes to if statement