Added the or to some labels and removed time-frame