Added extra shift, fixed order of days, correct format for calculation