Added Day of the week, warnings need checking