Relocated the date switches