added in week/year argument where necessary