some stupid changes and logic for health