Added an Or statement too