Changed method to contain Or