Pubic Health Fixes
Merge branch 'jay-june-4'