some stupid changes and logic for health
Manual merge of dev_anpatel after first draft of health