Merge pull request #1003 from Noiwex/refactor

Replaced .Alive to .Health due to slowness of first one.