Now runs seamlessly between hours