Fixed deaths by using existing API Methods (much easier and should work now; didn't test)