Added week computation