Added week # calculation