fix week 17
long run times and locations