Changed the conditional from add to or