added calculations for number of weeks