Updated for epi week 36.  Improved map vectors