Added week handling