changed to if or