Hardcoded fix for jackie's health
Merge remote-tracking branch 'origin/master'